From b1542fe9138f7a8ecc0d30fa59ba046685f45c9b Mon Sep 17 00:00:00 2001
From: Tristan Van Berkom <tvb@src.gnome.org>
Date: Wed, 16 Apr 2008 16:35:17 +0000
Subject: [PATCH] Chain up in buildable_finish()

	* gtk/gtkwindow.c: Chain up in buildable_finish()

	* gtk/gtkbuilder.c: _gtk_builder_get_absolute_filename() handle
	cases where g_path_get_dirname() returns "."

	* docs/reference/gtk/tmpl/gtklabel.sgml,
	docs/reference/gtk/tmpl/gtkbuilder.sgml: Added documentation
	for the <attributes> tags on GtkLabel


svn path=/trunk/; revision=20008
---
 ChangeLog                               | 11 +++++++++++
 docs/reference/gtk/tmpl/gtkbuilder.sgml |  1 +
 docs/reference/gtk/tmpl/gtklabel.sgml   | 21 +++++++++++++++++++++
 gtk/gtkbuilder.c                        | 12 ++++++++++--
 gtk/gtkwindow.c                         |  2 ++
 5 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c698d15598..c6e7ca4ed8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-04-16  Tristan Van Berkom <tvb@gnome.org>
+
+	* gtk/gtkwindow.c: Chain up in buildable_finish()
+
+	* gtk/gtkbuilder.c: _gtk_builder_get_absolute_filename() handle
+	cases where g_path_get_dirname() returns "."
+
+	* docs/reference/gtk/tmpl/gtklabel.sgml, 
+	docs/reference/gtk/tmpl/gtkbuilder.sgml: Added documentation
+	for the <attributes> tags on GtkLabel
+
 2008-04-15  Emmanuele Bassi  <ebassi@gnome.org>
 
 	* gtk/gtkrecentmanager.c:
diff --git a/docs/reference/gtk/tmpl/gtkbuilder.sgml b/docs/reference/gtk/tmpl/gtkbuilder.sgml
index b09c874a70..0677fc158f 100644
--- a/docs/reference/gtk/tmpl/gtkbuilder.sgml
+++ b/docs/reference/gtk/tmpl/gtkbuilder.sgml
@@ -203,6 +203,7 @@ gets parsed by the custom tag handler of the object.
 These XML fragments are explained in the documentation of the
 respective objects, see 
 <link linkend="GtkWidget-BUILDER-UI">GtkWidget</link>,
+<link linkend="GtkLabel-BUILDER-UI">GtkLabel</link>,
 <link linkend="GtkContainer-BUILDER-UI">GtkContainer</link>,
 <link linkend="GtkDialog-BUILDER-UI">GtkDialog</link>,
 <link linkend="GtkCellLayout-BUILDER-UI">GtkCellLayout</link>,
diff --git a/docs/reference/gtk/tmpl/gtklabel.sgml b/docs/reference/gtk/tmpl/gtklabel.sgml
index 1d2ced52bf..25e10b1283 100644
--- a/docs/reference/gtk/tmpl/gtklabel.sgml
+++ b/docs/reference/gtk/tmpl/gtklabel.sgml
@@ -11,6 +11,27 @@ implies, most labels are used to label another widget such as a
 #GtkButton, a #GtkMenuItem, or a #GtkOptionMenu.
 </para>
 
+<refsect2 id="GtkLabel-BUILDER-UI">
+<title>GtkLabel as GtkBuildable</title>
+<para>
+The GtkLabel implementation of the GtkBuildable interface supports a 
+custom &lt;attributes&gt; element, which supports any number of &lt;attribute&gt;
+elements. the &lt;attribute&gt; element has attributes named name, value,
+start and end and allows you to specify #PangoAttributs for this label.
+</para>
+<example>
+<title>A UI definition fragment specifying pango attributes</title>
+<programlisting><![CDATA[
+<object class="GtkLabel">
+  <attributes>
+    <attribute name=\"weight\" value=\"PANGO_WEIGHT_BOLD\"/>
+  </attributes>
+</object>
+]]></programlisting>
+</example>
+</refsect2>
+
+
 <refsect2>
 <title>Mnemonics</title>
 
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index dcea632844..77f416447d 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -1460,8 +1460,16 @@ _gtk_builder_get_absolute_filename (GtkBuilder *builder, const gchar *string)
     return g_strdup (string);
 
   if (builder->priv->filename &&
-      strcmp (builder->priv->filename, ".") != 0)
-    dirname = g_path_get_dirname (builder->priv->filename);
+      strcmp (builder->priv->filename, ".") != 0) 
+    {
+      dirname = g_path_get_dirname (builder->priv->filename);
+
+      if (strcmp (dirname, ".") == 0)
+	{
+	  g_free (dirname);
+	  dirname = g_get_current_dir ();
+	}
+    }
   else
     dirname = g_get_current_dir ();
     
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 27412221cb..f24228917d 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -1162,6 +1162,8 @@ gtk_window_buildable_parser_finished (GtkBuildable *buildable,
 
   if (priv->builder_visible)
     gtk_widget_show (GTK_WIDGET (buildable));
+
+    parent_buildable_iface->parser_finished (buildable, builder);
 }
 
 /**
-- 
2.30.2